[8.2](backport #31785) Feature/cache expiration #31977

mergify · 2022-06-17T14:31:58Z

This is an automatic backport of pull request #31785 done by Mergify.
Cherry-pick of 4b625fc has failed:

On branch mergify/bp/8.2/pr-31785
Your branch is up to date with 'origin/8.2'.

You are currently cherry-picking commit 4b625fc411.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   libbeat/common/cache.go
	modified:   metricbeat/module/kubernetes/container/container_test.go
	modified:   metricbeat/module/kubernetes/kubernetes.go
	modified:   metricbeat/module/kubernetes/node/node.go
	modified:   metricbeat/module/kubernetes/pod/pod_test.go
	modified:   metricbeat/module/kubernetes/state_container/state_container.go
	modified:   metricbeat/module/kubernetes/state_cronjob/state_cronjob.go
	modified:   metricbeat/module/kubernetes/state_deployment/state_deployment.go
	modified:   metricbeat/module/kubernetes/state_job/state_job.go
	modified:   metricbeat/module/kubernetes/state_node/state_node.go
	modified:   metricbeat/module/kubernetes/state_pod/state_pod.go
	modified:   metricbeat/module/kubernetes/state_replicaset/state_replicaset.go
	modified:   metricbeat/module/kubernetes/state_resourcequota/state_resourcequota.go
	modified:   metricbeat/module/kubernetes/state_service/state_service.go
	modified:   metricbeat/module/kubernetes/state_statefulset/state_statefulset.go
	modified:   metricbeat/module/kubernetes/state_storageclass/state_storageclass.go
	modified:   metricbeat/module/kubernetes/util/metrics_cache.go
	modified:   metricbeat/module/kubernetes/util/metrics_cache_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   metricbeat/module/kubernetes/container/container.go
	both modified:   metricbeat/module/kubernetes/pod/pod.go
	both modified:   metricbeat/module/kubernetes/state_daemonset/state_daemonset.go
	both modified:   metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go
	both modified:   metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go
	both modified:   metricbeat/module/kubernetes/util/kubernetes.go
	both modified:   metricbeat/module/kubernetes/volume/volume.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

@Mergifyio refresh will re-evaluate the rules
@Mergifyio rebase will rebase this PR on its base branch
@Mergifyio update will merge the base branch into this PR
@Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

look at your merge queues
generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fixed cache expiration bug (cherry picked from commit 4b625fc) # Conflicts: # metricbeat/module/kubernetes/container/container.go # metricbeat/module/kubernetes/pod/pod.go # metricbeat/module/kubernetes/state_daemonset/state_daemonset.go # metricbeat/module/kubernetes/state_persistentvolume/state_persistentvolume.go # metricbeat/module/kubernetes/state_persistentvolumeclaim/state_persistentvolumeclaim.go # metricbeat/module/kubernetes/util/kubernetes.go # metricbeat/module/kubernetes/volume/volume.go

botelastic · 2022-06-17T14:32:04Z

This pull request doesn't have a Team:<team> label.

elasticmachine · 2022-06-17T14:54:18Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2022-06-20T10:59:30.224+0000
Duration: 84 min 51 sec

Test stats 🧪

Test	Results
Failed	0
Passed	22038
Skipped	1803
Total	23841

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.
/package : Generate the packages and run the E2E tests.
/beats-tester : Run the installation tests with beats-tester.
run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

mergify · 2022-06-20T04:37:23Z

This pull request has not been merged yet. Could you please review and merge it @gsantoro? 🙏

ChrsMark

This one needs some care to resolve conflicts etc.

ChrsMark · 2022-06-20T08:09:01Z

CHANGELOG.next.asciidoc

@@ -48,6 +48,9 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]

 *Metricbeat*

+- make `system/filesystem` code sensitive to `hostfs` and migrate libraries to `elastic-agent-opts` {pull}31001[31001]


Need fix. The backport script usually mess thing up in changelogs.

ChrsMark · 2022-06-20T08:09:36Z

metricbeat/module/kubernetes/container/container.go

@@ -93,7 +93,11 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) {
 		return
 	}

+<<<<<<< HEAD


Conflict I guess.

ChrsMark · 2022-06-20T08:09:46Z

metricbeat/module/kubernetes/pod/pod.go

@@ -94,7 +94,11 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) {
 		return
 	}

+<<<<<<< HEAD


Another one.

ChrsMark · 2022-06-20T08:09:55Z

metricbeat/module/kubernetes/state_daemonset/state_daemonset.go

@@ -89,7 +89,11 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	return &MetricSet{
 		BaseMetricSet: base,
 		prometheus:    prometheus,
+<<<<<<< HEAD


ChrsMark

WFG and merge!

* Feature/cache expiration (elastic#31785)

mergify bot requested review from a team as code owners June 17, 2022 14:31

mergify bot requested review from belimawr and fearful-symmetry and removed request for a team June 17, 2022 14:31

mergify bot added backport conflicts There is a conflict in the backported pull request labels Jun 17, 2022

mergify bot assigned gsantoro Jun 17, 2022

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 17, 2022

ChrsMark requested changes Jun 20, 2022

View reviewed changes

gsantoro added 2 commits June 20, 2022 10:50

resolved conflicts

0993eac

fixed changelog and backported daemonset

c4d17fc

ChrsMark approved these changes Jun 20, 2022

View reviewed changes

gsantoro added 2 commits June 20, 2022 12:39

fixed linter issues

34e7b5e

fixed more linter errors

ad3e877

gsantoro merged commit 77cfcdf into 8.2 Jun 20, 2022

gsantoro deleted the mergify/bp/8.2/pr-31785 branch June 20, 2022 12:24

leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023

[8.2](backport elastic#31785) Feature/cache expiration (elastic#31977)

580b653

* Feature/cache expiration (elastic#31785)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[8.2](backport #31785) Feature/cache expiration #31977

[8.2](backport #31785) Feature/cache expiration #31977

mergify bot commented Jun 17, 2022 •

edited by zube bot

Loading

botelastic bot commented Jun 17, 2022

elasticmachine commented Jun 17, 2022 •

edited by jenkins-beats-ci bot

Loading

Build stats

Test stats 🧪

mergify bot commented Jun 20, 2022

ChrsMark left a comment

ChrsMark Jun 20, 2022

ChrsMark Jun 20, 2022

ChrsMark Jun 20, 2022

ChrsMark Jun 20, 2022

ChrsMark left a comment

		@@ -48,6 +48,9 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]

		Metricbeat

		- make `system/filesystem` code sensitive to `hostfs` and migrate libraries to `elastic-agent-opts` {pull}31001[31001]

[8.2](backport #31785) Feature/cache expiration #31977

[8.2](backport #31785) Feature/cache expiration #31977

Conversation

mergify bot commented Jun 17, 2022 • edited by zube bot Loading

botelastic bot commented Jun 17, 2022

elasticmachine commented Jun 17, 2022 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Test stats 🧪

💚 Flaky test report

🤖 GitHub comments

mergify bot commented Jun 20, 2022

ChrsMark left a comment

Choose a reason for hiding this comment

ChrsMark Jun 20, 2022

Choose a reason for hiding this comment

ChrsMark Jun 20, 2022

Choose a reason for hiding this comment

ChrsMark Jun 20, 2022

Choose a reason for hiding this comment

ChrsMark Jun 20, 2022

Choose a reason for hiding this comment

ChrsMark left a comment

Choose a reason for hiding this comment

mergify bot commented Jun 17, 2022 •

edited by zube bot

Loading

elasticmachine commented Jun 17, 2022 •

edited by jenkins-beats-ci bot

Loading